Skip to content

[AUTO-CHERRYPICK] python-virtualenv: reconcile CA cleanup and test bootstrap for 3.0-dev - #19725

Merged
jslobodzian merged 4 commits into
3.0-devfrom
cblmargh/cherry-pick-pr-19710-to-3.0-dev
Oct 31, 2026
Merged

jslobodzian merged 4 commits into
3.0-devfrom
cblmargh/cherry-pick-pr-19710-to-3.0-dev

Conversation

@azurelinux-ci-jwt-app

@azurelinux-ci-jwt-app azurelinux-ci-jwt-app Bot commented Oct 25, 2026 •

Copy link
Copy Markdown

Summary

Cherry-pick the published Fast-Track CA cleanup into 3.0-dev, reconciled with the branch's existing package-test bootstrap.

Original Fast-Track PR: #19710
Published source commit: 78a1a1873c10791d520bf6c078abd0f092a9725d

Changes

  • Remove affected eMudhra and AAA roots from both embedded pip wheels and regenerate their wheel RECORD entries after the existing security backports.
  • Retain the existing 3.0-dev tox-based test bootstrap, pinning packaging==23.2 when installing test tooling so pip does not replace the RPM-owned package.
  • Reconcile the independently developed 20.36.1-8 packages as 20.36.1-9. Preserve the published Fast-Track changelog entry and record the dev test-bootstrap reconciliation above it.

All published CA and embedded-wheel security patches, source signatures, and build/install logic are preserved. This PR targets 3.0-dev; it does not change the published Fast-Track package.

Build and tests

Unified buddy build 1241435 succeeded with package tests and install tests enabled on both AMD64 and ARM64.

The buddy build tested the identical build/test payload in #19853 at af92b2591d5e9cf25db9bc5a8308b2f5f1671f7e. This PR additionally updates the unpublished reconciliation changelog to describe the combined package accurately.

…9710)

Co-authored-by: Jon Slobodzian <jslobodzian@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e62137f2-2602-418d-ba0d-3b1f2ff0259e
(cherry picked from commit 78a1a18)
@azurelinux-ci-jwt-app azurelinux-ci-jwt-app Bot added the Auto Fast-track Cherry-pick Automatic cherry-pick from fast-track branch label Oct 25, 2026
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@microsoft-github-policy-service microsoft-github-policy-service Bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Oct 25, 2026
@azurelinux-ci-jwt-app
azurelinux-ci-jwt-app Bot marked this pull request as ready for review October 25, 2026 03:50
@azurelinux-ci-jwt-app

Copy link
Copy Markdown
Author

All conflicts resolved.

@azurelinux-ci-jwt-app
azurelinux-ci-jwt-app Bot requested a review from a team as a code owner October 25, 2026 03:50
@azurelinux-ci-jwt-app

Copy link
Copy Markdown
Author

Auto Cherry-Pick SPEC Validation Summary

python-virtualenv SPEC summary

Source (fasttrack) Target (3.0-dev) Resolved
Version 20.36.1 20.36.1 20.36.1
Release 8 8 9
Patches 17 16 17
Conflict Yes

⚠️ Validation issues:

  • Unresolved conflict markers (<<<<<<< / >>>>>>>) found in file
  • Duplicate changelog entry for 20.36.1-6 (appears 2 times)

⚠️ Manual review required — validation found issues that may need correction.

Preserve the published CA patch, wheel helper invocation, and private pinned pytest environment. Remove committed conflict markers, duplicate test flows and duplicate changelog entries. Resequence the dev RPM-owned-packaging fix as release 9.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 5ed20da6-df62-47ec-8bba-6847e07d8f43
Retain the existing tox-based ptest bootstrap with packaging==23.2 alongside the published Fast-Track CA cleanup. The build/test payload is identical to successful AMD64 and ARM64 buddy build 1241435; update the unpublished release9 reconciliation entry while preserving the published release8 history and all security patches.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 5ed20da6-df62-47ec-8bba-6847e07d8f43
@jslobodzian jslobodzian changed the title [AUTO-CHERRYPICK] python-virtualenv: remove affected roots from embedded pip wheels - branch 3.0-dev [AUTO-CHERRYPICK] python-virtualenv: reconcile CA cleanup and test bootstrap for 3.0-dev Oct 31, 2026
@jslobodzian
jslobodzian merged commit a01e73f into 3.0-dev Oct 31, 2026
17 checks passed
@jslobodzian
jslobodzian deleted the cblmargh/cherry-pick-pr-19710-to-3.0-dev branch October 31, 2026 13:36
jslobodzian added a commit that referenced this pull request Oct 31, 2026
Preserve the published release9 security patch set and dependency ordering. Retain the tox-based package-test bootstrap now merged through #19725, resequencing its reconciliation entry above published history as release10. Net changes against current dev are only the 14 published backports and the corresponding SPEC/changelog updates.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 5ed20da6-df62-47ec-8bba-6847e07d8f43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Auto Fast-track Cherry-pick Automatic cherry-pick from fast-track branch Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant